Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 27 May 2011 19:56:58 +0000 (12:56 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 27 May 2011 19:56:58 +0000 (12:56 -0700)
commitd181855d456c9e82a874db8427c1b35220d6d4ae
tree2ad47f1dea82c8cb30c20a91a2dbb58724d41741
parentc8bdf6f8e1e06f112e5c8eb22b964b9402754062
parent63b6b7ba5637145942f16d9c5e317eedfc13fd2e
Merge from trunk.
src/ChangeLog